From c76c5f4857b05ac5a2cc2b01201ee7c97f4a74be Mon Sep 17 00:00:00 2001 From: 2 Date: Wed, 22 Nov 2000 07:45:28 +0000 Subject: [PATCH] It's amazing what reversing the order in an if statement will do. Doing so 2000-11-22 * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what reversing the order in an if statement will do. Doing so managed to make the treemodelsort half work. Other half will follow after I get the insert function fully fixed. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktreeview.c | 4 ++-- 8 files changed, 51 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb61dcb770..88a93877ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bb61dcb770..88a93877ff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2000-11-22 + + * gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what + reversing the order in an if statement will do. Doing so managed + to make the treemodelsort half work. Other half will follow after + I get the insert function fully fixed. + 2000-11-21 Elliot Lee * gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly more than 2 bits. Besides, I need to implement an evil hack. :) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e1122db48c..f8ed23d770 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2318,8 +2318,8 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view, column->size = MAX (column->size, width); } _gtk_rbtree_node_set_height (tree, temp, max_height); - if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) && - temp->children != NULL) + if (temp->children != NULL && + gtk_tree_model_iter_children (tree_view->priv->model, &child, iter)) gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1); temp = _gtk_rbtree_next (tree, temp); } -- 2.30.2